Merged.
authoremellor@ewan <emellor@ewan>
Tue, 11 Oct 2005 14:23:19 +0000 (15:23 +0100)
committeremellor@ewan <emellor@ewan>
Tue, 11 Oct 2005 14:23:19 +0000 (15:23 +0100)

Trivial merge